Backport fix for Bug#11282 from trunk
authorKenichi Handa <handa@m17n.org>
Fri, 4 May 2012 10:27:58 +0000 (18:27 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 4 May 2012 10:27:58 +0000 (18:27 +0800)

Trivial merge